Revision: baz--authentication--1.3--patch-16
Archive: jblack@gnuarch.org--2005
Creator: James Blackwell <jblack@canonical.com>
Date: Tue Apr 19 01:04:25 EDT 2005
Standard-date: 2005-04-19 05:04:25 GMT
Modified-files: baz/baz.c commands/add-id.c
    commands/apply-delta.c commands/cmdutils.c
    commands/register-archive.c libarch/apply-changeset.c
    libarch/debug.h tests/test-merge.sh
New-patches: jblack@gnuarch.org--2005/baz--authentication--1.3--patch-16
    rob.weir@canonical.com--2005-public/baz--baznotarch--0--base-0
    rob.weir@canonical.com--2005-public/baz--baznotarch--0--patch-1
    rob.weir@canonical.com--2005-public/baz--bug305041--0--base-0
    rob.weir@canonical.com--2005-public/baz--bug305041--0--patch-1
    rob.weir@canonical.com--2005-public/baz--bug315--0--base-0
    rob.weir@canonical.com--2005-public/baz--bug315--0--patch-1
    rob.weir@canonical.com--2005-public/baz--bug342b--0--base-0
    rob.weir@canonical.com--2005-public/baz--bug342b--0--patch-1
    robert.collins@canonical.com--general/bazaar--devel--1.4--patch-16
    thelove@canonical.com/bazaar--devo--1.4--patch-16
    thelove@canonical.com/bazaar--devo--1.4--patch-17
    thelove@canonical.com/bazaar--devo--1.4--patch-18
    thelove@canonical.com/bazaar--devo--1.4--patch-19
    thelove@canonical.com/bazaar--devo--1.4--patch-20
    thelove@canonical.com/bazaar--devo--1.4--patch-21
    thelove@canonical.com/bazaar--devo--1.4--patch-22
Summary: Merging from upstream (again)
Keywords: 

Patches applied:

 * rob.weir@canonical.com--2005-public/baz--baznotarch--0--base-0
   tag of thelove@canonical.com/bazaar--devo--1.4--patch-19

 * rob.weir@canonical.com--2005-public/baz--baznotarch--0--patch-1
   s/arch/baz/ in baz -h output.

 * rob.weir@canonical.com--2005-public/baz--bug305041--0--base-0
   tag of thelove@canonical.com/bazaar--devo--1.4--patch-19

 * rob.weir@canonical.com--2005-public/baz--bug305041--0--patch-1
   Get rid of the new line from add --version's help.

 * rob.weir@canonical.com--2005-public/baz--bug315--0--base-0
   tag of thelove@canonical.com/bazaar--devo--1.4--patch-16

 * rob.weir@canonical.com--2005-public/baz--bug315--0--patch-1
   Fix segfault when trying to switch to branches in unregistered archives.

 * rob.weir@canonical.com--2005-public/baz--bug342b--0--base-0
   tag of thelove@canonical.com/bazaar--devo--1.4--patch-18

 * rob.weir@canonical.com--2005-public/baz--bug342b--0--patch-1
   Make register-archive help text clearer about use of the name parameter.

 * robert.collins@canonical.com--general/bazaar--devel--1.4--patch-16
   bugfix apply-changeset to detect conflicting double-adds of ids

 * thelove@canonical.com/bazaar--devo--1.4--patch-16
   merge in inode-sigs hide permission changes bugfix from tla 1.3.2

 * thelove@canonical.com/bazaar--devo--1.4--patch-17
   Fix segfault when trying to switch to branches in unregistered archives.

 * thelove@canonical.com/bazaar--devo--1.4--patch-18
   bugfix three-way patch application, symlink adds when the symlink exists are not conflicts if the target is the same.

 * thelove@canonical.com/bazaar--devo--1.4--patch-19
   Make register-archive help text clearer about use of the name parameter.

 * thelove@canonical.com/bazaar--devo--1.4--patch-20
   bugfix apply-changeset to detect conflicting double-adds of ids

 * thelove@canonical.com/bazaar--devo--1.4--patch-21
   Get rid of the new line from add --version's help.

 * thelove@canonical.com/bazaar--devo--1.4--patch-22
   s/arch/baz/ in baz -h output.

